Change-Id: I0d7188b3fa82dddf3f9fb9523d716a8f15f46184
* Adjust them for usage in /vendor while at it. Change-Id: I84463a912d98e8af14ca31ffd8ac95db1aac916e