Merge "Make VNDK APEX as bootstrap APEX"