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

Change-Id: I68c3c68a976d54fd1d62cb788a643c0da9820ecc