Merge "Update the button layouts and colors of StkInputActivity" am: c5116a8dbe
am: 0dea3fe782

Change-Id: Ic981088224db7b3a2608538c6a54141037cd5da6