Merge "updatable_apex.mk is not inherited from  mainline_system.mk"