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