Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev am: f3157e1692
am: 39b5ad8411

Change-Id: Ia159ba2bff5cc333e6945d05291002ab8669c612