Merge "Revert "Make VNDK APEX as bootstrap APEX""