Merge pull request #1112 from jaypoulz/bdAndroidL

Bd android l
Merge pull request #1114 from jaypoulz/bdAndroidL

Bd android l
Merge pull request #1116 from jaypoulz/bdAndroidL

Bd android l
Merge remote-tracking branch 'upstream/bdAndroidL' into bdAndroidL