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

Change-Id: Ie3f51d1acb80977bf8e0db24ac66fc678d8accfd