Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev am: 2b6bf2f221
am: a02972ed41

Change-Id: Id2b00a68a52ee9721f4eea42be49601811da885c