Merge changes from topic "aosp-apk-in-apex"
am: c7a4eec435

Change-Id: I0e511bd0c737d230941d4f28b8d0081bf3f81ab3