Add AOSP version
(cherry picked from commit 963cb165c77d3c084e0e11812187c336898f660c)

(cherry picked from commit 44987456bcf7eb8187184a08456c50d942ba8d0a)
(cherry picked from commit ec6a8031c6115a4f2c18625caf03fdebc4adc7ee)
(cherry picked from commit 431222ca640a22ba1101eb6c63413ed751e124b1)
(cherry picked from commit bc1d912cd31f40b724d851438160e012737150e6)
(cherry picked from commit d8d8958e51c6a990b3bd1d52e3884cbfc9ad41e8)
(cherry picked from commit d83c61131051f47e5ecac4f1c288022669edec63)
(cherry picked from commit 78ef55f03bb6a5118ecc6844579cec76872ebb04)
(cherry picked from commit 48260ff7ae2f51f7d61b96562415b781194cd30c)
(cherry picked from commit a5b9b834210e7065eff1845805b3582be58603fe)
(cherry picked from commit 09ebd5eef0b09eb0ffad20a43021a3e035af3aba)
(cherry picked from commit cfdc5308da58013e2329bd9eb187408b81cbd28c)
(cherry picked from commit 9206e3e2a1a0ca5d05e52893586bf4a965961d50)
(cherry picked from commit 264197886e7a525b7110e424530012857a2bf17e)
(cherry picked from commit 0b147d69e5b6f656530d8133c4937f42eae4ccda)
(cherry picked from commit df3bd3e9f2a6cdb837f20b5b7ea5d857cb3cb33a)
(cherry picked from commit 8734f8db169b698321f067ef40e88b0b69582b19)
(cherry picked from commit 18333dd1bc5b6a81155349953ca4e8aa6e30b40f)
(cherry picked from commit 1401a0930ebd31d6c01aeb3c0f486fc161809e9b)
Add AOSP version 2

(cherry picked from commit d13ba7ebb990312f06bb23c65738c94c76ebdcfa)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 0c3acbaaeabdd1a890758e0669265b01ec9ea3bd)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit a5efc4cde54593af6bf35562752edf4df4f0728a)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit cd1e4e7b900e4271788f039d45f7ec54619e50e1)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 6e0e1f6d0810479d2f44a8b4d646d3255f369adb)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 86655bf0b58c5fb145c04d738e7752b4d3d2c638)

Conflicts:
	res/values/cr_strings.xml
	res/xml/device_info_settings.xml
rename Home

(cherry picked from commit 9223cf0158213febcf070abd6910e2ea36d9158f)
(cherry picked from commit ec94213560bd25feac17dd911ef577f09b253ec7)
(cherry picked from commit aea7c365c4b1785c575546cdcc0164052efe94e5)
(cherry picked from commit 6795910b52fef7a7fea106337ed02724fcb3647d)
(cherry picked from commit 50cac53f236540482aa44f0b509a3b2465c149e4)
(cherry picked from commit 56f39dd0981f526bf9cb8d4067f27ccb85f29ee5)
clean up cr_strings
Add build id to AOSP rev

(cherry picked from commit bc28464e36f959f33ccf796561a8901d0c68bb09)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit f1bbaf26c9e86ea976c7638565a5fbe91316355c)
(cherry picked from commit a53990cab1f04d5dedcad19d0c1e7e469cbdc9a3)
(cherry picked from commit f08eff19efdc2995f02e0ef7211142424e006442)
(cherry picked from commit 03bc96419970711e96052a1ec916ffe0768c516c)
(cherry picked from commit 86ca2cabb237f72000ebda31803ecb9e9d3d86a0)
(cherry picked from commit 31e3add73faede5b062ee620d591d362aa2847df)
Derp

(cherry picked from commit 1c27e9a42a3bd84736e5b88df7e508e50ab67cc6)
(cherry picked from commit 0b6a692000e22631e8e2db5c26b490c20c2891d2)

Conflicts:
	res/values/cr_strings.xml
AOSP update to 5.0.0r2