Follow our own msm8660.  Fix build issues with remote

Change-Id: Iee66b783eaa654b209ac19fb74c403643850b3aa