Merge "Use the min sdk version from soong." am: 22b45d401a am: 21751a0a67
am: 66383baf27

Change-Id: I716cc072baf1019af6671b3ce6db6d0698640ec6