Merge "Add apex packages to uid_mapping" into qt-dev
am: 330a3d89fa

Change-Id: I7fe7037887e22cde409ef8a2177e5974fcfe7633