Merge "Stop build of unused libraries." am: 9ed309a am: 8d1af01 am: e096759
am: ea8b364

* commit 'ea8b3640dfeb709ee43adc476e37ec7c5deacf0f':
  Stop build of unused libraries.

Change-Id: I8138d653292fe06739695b0337f7f31bf1fad190