Merge "Handle shared libraries for split apks." am: 9487dff8 am: dae160f5 am: 98f62d8a -s ours am: 98799bdd -s ours Change-Id: Ia69b2ada3a0c6e51ec4742d52d8f76aa616cc6cd