This reverts commit 1675f2c5. With latest Android source, now we can boot up without this workaround. BUG: 19180814 Change-Id: I8a7852573856dbbe10a5f4823f7261b8ecc7490c