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

Change-Id: I7afbe0ae0d216a54c85bda910d55caafcbef2ece