Merge "Remove the local sdk version from car support lib" into oc-dev am: 06b6f9950c
am: d8e2e3f526  -s ours

Change-Id: Ie5ae8544cf75658c56deaf655a37457027fc9d76