Merge "Don't specify target_sdk_version" into rvc-dev am: f33f31cd52

Change-Id: I2b8abab24aec22f56095fd65628fb7ac39019635