Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  [DO NOT MERGE] make_f2fs: issue discard commands on mkfs

Change-Id: I1644475c84ce24b84a68d914513598fd35d8f797