Merge "Remove $(shell) from Makefile" am: d27d7495bf am: 55af3d64ad am: a294adb9f4
am: 15d97861d8

Change-Id: Ib4eecd26007c22f68bfb789dbce36acae361909d