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

Change-Id: Id53f310af8dcbab58e1e57959401879eb0897a79