Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e
am: 52d8960892

* commit '52d896089282a7b651cd2eb4adac719b63e14c8a':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: Ie190a5d2b689d7e655b3955a64095b4f2ea45cfb