Merge "Handle shared libraries for split apks." am: 9487dff8ab am: dae160f51b am: 98f62d8aa0  -s ours
am: 98799bddfb  -s ours

Change-Id: Ia69b2ada3a0c6e51ec4742d52d8f76aa616cc6cd