Fixed mk file issues that caused errors while building

Change-Id: Ic96f43b0fec6de5ccf8bc8ec779c9d544b892249
Merge https://github.com/a2441918/android_external_chromium_org into cm-11.0

Change-Id: Ic43b6cfffb3f1a81379851d04368022203322a41