Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
am: 9387e5cd61

Change-Id: Ia6abd2750228e98662f04b241489285b7dcb9eb5