Merge "Set min_sdk_version to apex_inherit" am: 31df94e286 am: 4e7065d53b am: 957d1a8a63 am: b81afd64d6 am: 3e4f2104b9

Change-Id: I8e6f32b2b64557c94cb13536e159d61f90e460e8