Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
am: 14e7eb7108

Change-Id: I3e36cb4117118e0e62c2718d5e42144c210f93cd