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

Change-Id: I11150a03aa79f2864148e49a300ffb7264a05e2b