am ba46260f: Merge "Runtime resource overlay, iteration 2"
am ba46260f: Merge "Runtime resource overlay, iteration 2"

* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
  Runtime resource overlay, iteration 2

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