Merge "vndk-ext should come before vndk(VNDK APEX)"
am: 1314c36936

Change-Id: Iaf16abaf2c5f4ac25c384f6d68b4e2262707c1b5