Merge "GSI: add the messaging app" into oc-mr1-dev am: 90e737c6b6
am: 32aeb3f175

Change-Id: Ic858fcc97fa1ed2fc1c9b81e1987ed868d3c515c