Merge "DO NOT MERGE Update to use android-support-car instad of macro" into pi-dev