cm's fork of chromium_org, and add back btext

Change-Id: I1abe1f7311a6ec057cf8cddcc9de4f384798d120