Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7 am: e931e59dc6
am: bf9c5c393a

Change-Id: Id1df276d094a94a265561f43ad572b6ba08d7cbd