Merge "Merge \\\\"Swap fill_parent with match_parent in best practices doc.\\\\" into mnc-io-docs am: df4528fbe8 am: 1729c75f73 am: 8bf5f6c851 am: 18fdb53359" into nyc-mr1-dev-plus-aosp