Merge "Handle shared libraries for split apks." am: 9487dff8ab
am: dae160f51b

Change-Id: I3b8fd7be7bf987858df229cfd95ca8d4dc170b54