Build straight with AOGP info in About phone

Change-Id: Ib86fc8ad53de750c9deb728990501f2adae5d11e