am 1eba3c14: am 484c7dec: am ba46260f: Merge "Runtime resource overlay, iteration 2"
am 1eba3c14: am 484c7dec: am ba46260f: Merge "Runtime resource overlay, iteration 2"

* commit '1eba3c14c760d89150f68141f708621dd46d69bd':
  Runtime resource overlay, iteration 2

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build