Merge "Resource shared libraries: fix theme references" into nyc-dev
am: 47521a6631

* commit '47521a66314555e2450192a77e75ccbeb19acbb0':
  Resource shared libraries: fix theme references

Change-Id: Ie0265ea7652bb29d017eedae16ecff85c665d71f