Merge "Add @UnsupportedAppUsage to the old inline APIs for compatibility" into rvc-dev am: c068acb6 am: 739dc571 Change-Id: I856842a0980b695e25b5efb6b84a041367c2cb6f