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

Change-Id: I907637f833e088d59e2555c6e4e6a1e31a4f56d0